home *** CD-ROM | disk | FTP | other *** search
- *** libgroff/string.cc.orig Thu Jun 22 09:41:38 1995
- --- libgroff/string.cc Sat Dec 9 19:56:54 1995
- ***************
- *** 270,276 ****
-
- int string::search(char c) const
- {
- ! char *p = (char *)memchr(ptr, c, len);
- return p ? p - ptr : -1;
- }
-
- --- 270,276 ----
-
- int string::search(char c) const
- {
- ! char *p = (char *)memchr((void *)ptr, c, len);
- return p ? p - ptr : -1;
- }
-
- *** libbib/linear.cc.orig Thu Jun 22 09:41:41 1995
- --- libbib/linear.cc Sat Dec 9 20:02:58 1995
- ***************
- *** 325,331 ****
- nread = read(fd, &c, 1);
- if (nread != 0)
- error("size of `%1' increased", filename);
- ! else if (memchr(buffer + 4, '\0', size < 1024 ? size : 1024) != 0)
- error("database `%1' is a binary file", filename);
- else {
- close(fd);
- --- 325,331 ----
- nread = read(fd, &c, 1);
- if (nread != 0)
- error("size of `%1' increased", filename);
- ! else if (memchr((void *)(buffer + 4), '\0', size < 1024 ? size : 1024) != 0)
- error("database `%1' is a binary file", filename);
- else {
- close(fd);
- *** refer/ref.cc.orig Tue Jun 27 17:48:39 1995
- --- refer/ref.cc Sat Dec 9 23:05:22 1995
- ***************
- *** 639,645 ****
- const char *ptr = str.contents();
- const char *end = ptr + str.length();
- while (ptr < end) {
- ! const char *name_end = (char *)memchr(ptr, FIELD_SEPARATOR, end - ptr);
- if (name_end == 0)
- name_end = end;
- abbreviate_name(ptr, name_end, result);
- --- 639,645 ----
- const char *ptr = str.contents();
- const char *end = ptr + str.length();
- while (ptr < end) {
- ! const char *name_end = (char *)memchr((void *)ptr, FIELD_SEPARATOR, end - ptr);
- if (name_end == 0)
- name_end = end;
- abbreviate_name(ptr, name_end, result);
- ***************
- *** 679,685 ****
- result.append(ptr, end - ptr);
- break;
- }
- ! const char *name_end = (char *)memchr(ptr, FIELD_SEPARATOR, end - ptr);
- if (name_end == 0)
- name_end = end;
- reverse_name(ptr, name_end, result);
- --- 679,685 ----
- result.append(ptr, end - ptr);
- break;
- }
- ! const char *name_end = (char *)memchr((void *)ptr, FIELD_SEPARATOR, end - ptr);
- if (name_end == 0)
- name_end = end;
- reverse_name(ptr, name_end, result);
- ***************
- *** 823,829 ****
- int is_multiple = join_fields(f) > 0;
- if (capitalize_fields.search(i) >= 0)
- capitalize_field(f);
- ! if (memchr(f.contents(), '\n', f.length()) == 0) {
- fprintf(fp, ".ds [%c ", i);
- if (f[0] == ' ' || f[0] == '\\' || f[0] == '"')
- putc('"', fp);
- --- 823,829 ----
- int is_multiple = join_fields(f) > 0;
- if (capitalize_fields.search(i) >= 0)
- capitalize_field(f);
- ! if (memchr((void *)(f.contents()), '\n', f.length()) == 0) {
- fprintf(fp, ".ds [%c ", i);
- if (f[0] == ' ' || f[0] == '\\' || f[0] == '"')
- putc('"', fp);
- ***************
- *** 1020,1031 ****
- const char *nth_field(int i, const char *start, const char **endp)
- {
- while (--i >= 0) {
- ! start = (char *)memchr(start, FIELD_SEPARATOR, *endp - start);
- if (!start)
- return 0;
- start++;
- }
- ! const char *e = (char *)memchr(start, FIELD_SEPARATOR, *endp - start);
- if (e)
- *endp = e;
- return start;
- --- 1020,1031 ----
- const char *nth_field(int i, const char *start, const char **endp)
- {
- while (--i >= 0) {
- ! start = (char *)memchr((void *)start, FIELD_SEPARATOR, *endp - start);
- if (!start)
- return 0;
- start++;
- }
- ! const char *e = (char *)memchr((void *)start, FIELD_SEPARATOR, *endp - start);
- if (e)
- *endp = e;
- return start;
- ***************
- *** 1120,1131 ****
- return start;
- }
- while (--i >= 0) {
- ! start = (char *)memchr(start, SORT_SEP, end - start);
- if (!start)
- return 0;
- start++;
- }
- ! const char *e = (char *)memchr(start, SORT_SEP, end - start);
- if (e)
- end = e;
- if (si < 0) {
- --- 1120,1131 ----
- return start;
- }
- while (--i >= 0) {
- ! start = (char *)memchr((void *)start, SORT_SEP, end - start);
- if (!start)
- return 0;
- start++;
- }
- ! const char *e = (char *)memchr((void *)start, SORT_SEP, end - start);
- if (e)
- end = e;
- if (si < 0) {
- ***************
- *** 1133,1144 ****
- return start;
- }
- while (--si >= 0) {
- ! start = (char *)memchr(start, SORT_SUB_SEP, end - start);
- if (!start)
- return 0;
- start++;
- }
- ! e = (char *)memchr(start, SORT_SUB_SEP, end - start);
- if (e)
- end = e;
- if (ssi < 0) {
- --- 1133,1144 ----
- return start;
- }
- while (--si >= 0) {
- ! start = (char *)memchr((void *)start, SORT_SUB_SEP, end - start);
- if (!start)
- return 0;
- start++;
- }
- ! e = (char *)memchr((void *)start, SORT_SUB_SEP, end - start);
- if (e)
- end = e;
- if (ssi < 0) {
- ***************
- *** 1146,1157 ****
- return start;
- }
- while (--ssi >= 0) {
- ! start = (char *)memchr(start, SORT_SUB_SUB_SEP, end - start);
- if (!start)
- return 0;
- start++;
- }
- ! e = (char *)memchr(start, SORT_SUB_SUB_SEP, end - start);
- if (e)
- end = e;
- *endp = end;
- --- 1146,1157 ----
- return start;
- }
- while (--ssi >= 0) {
- ! start = (char *)memchr((void *)start, SORT_SUB_SUB_SEP, end - start);
- if (!start)
- return 0;
- start++;
- }
- ! e = (char *)memchr((void *)start, SORT_SUB_SUB_SEP, end - start);
- if (e)
- end = e;
- *endp = end;
-